Update d/changelog, add instructions on how to clean up a bad import

diff --git a/debian/README.source b/debian/README.source
index 4a2b5502aa647b8b01764a370db8c51c5a65e325..9cc1e9556389be8a9e4bc215315e358e9e54beb1 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,6 +10,11 @@ Updating the package
    $ git remote add upstream https://github.com/rust-lang/cargo
 4. $ gbp import-orig ../cargo_<version>.orig.tar.gz
    If you get errors, check the extra default flags in d/gbp.conf
+5. Check that no old versions remain in deps/. If there are, then your git repo
+   was messed up when you ran (4). Rewind the debian/sid, upstream, and
+   pristine-tar branches, delete the upstream/<version> tag; this reverts step
+   (4). Clean up your git repo, and then try (4) again.
+6. Update d/patches and the rest of the packaging, as normal.
 
 General info
 ============

diff --git a/debian/changelog b/debian/changelog
index a8a115e216c3c67e84a1076b04e8416cdcc53755..a8f572735b101b9412cb554d59bec7034fcb8706 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cargo (0.17.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  Thu, 20 Apr 2017 00:30:13 +0200
+
 cargo (0.15.0~dev-1) unstable; urgency=medium
 
   * New upstream snapshot (git 1877f59d6b2cb057f7ef6c6b34b926fd96a683c1)